+Tue Sep 15 13:09:24 1998 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/gdkimage.c (gdk_image_new): Reverted global changes
+ of g_new to malloc(), added back in the one place where
+ it actually mattered. #include <stdlib.h>.
+
+ * gdk/gdkrgb.c: g_malloc() to malloc() as above.
+
+Tue Sep 15 11:30:03 1998 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkfilesel.c: Keep a list of directories in which we never
+ want to stat the entries (like /afs), and assume everything in
+ those directories is a subdirectory.
+
+ - When following a path, try to open components even when
+ we don't find them in their parent's directory to
+ support automounters.
+
Tue Sep 15 11:06:13 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_move_resize): Don't request
+Tue Sep 15 13:09:24 1998 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/gdkimage.c (gdk_image_new): Reverted global changes
+ of g_new to malloc(), added back in the one place where
+ it actually mattered. #include <stdlib.h>.
+
+ * gdk/gdkrgb.c: g_malloc() to malloc() as above.
+
+Tue Sep 15 11:30:03 1998 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkfilesel.c: Keep a list of directories in which we never
+ want to stat the entries (like /afs), and assume everything in
+ those directories is a subdirectory.
+
+ - When following a path, try to open components even when
+ we don't find them in their parent's directory to
+ support automounters.
+
Tue Sep 15 11:06:13 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_move_resize): Don't request
+Tue Sep 15 13:09:24 1998 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/gdkimage.c (gdk_image_new): Reverted global changes
+ of g_new to malloc(), added back in the one place where
+ it actually mattered. #include <stdlib.h>.
+
+ * gdk/gdkrgb.c: g_malloc() to malloc() as above.
+
+Tue Sep 15 11:30:03 1998 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkfilesel.c: Keep a list of directories in which we never
+ want to stat the entries (like /afs), and assume everything in
+ those directories is a subdirectory.
+
+ - When following a path, try to open components even when
+ we don't find them in their parent's directory to
+ support automounters.
+
Tue Sep 15 11:06:13 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_move_resize): Don't request
+Tue Sep 15 13:09:24 1998 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/gdkimage.c (gdk_image_new): Reverted global changes
+ of g_new to malloc(), added back in the one place where
+ it actually mattered. #include <stdlib.h>.
+
+ * gdk/gdkrgb.c: g_malloc() to malloc() as above.
+
+Tue Sep 15 11:30:03 1998 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkfilesel.c: Keep a list of directories in which we never
+ want to stat the entries (like /afs), and assume everything in
+ those directories is a subdirectory.
+
+ - When following a path, try to open components even when
+ we don't find them in their parent's directory to
+ support automounters.
+
Tue Sep 15 11:06:13 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_move_resize): Don't request
+Tue Sep 15 13:09:24 1998 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/gdkimage.c (gdk_image_new): Reverted global changes
+ of g_new to malloc(), added back in the one place where
+ it actually mattered. #include <stdlib.h>.
+
+ * gdk/gdkrgb.c: g_malloc() to malloc() as above.
+
+Tue Sep 15 11:30:03 1998 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkfilesel.c: Keep a list of directories in which we never
+ want to stat the entries (like /afs), and assume everything in
+ those directories is a subdirectory.
+
+ - When following a path, try to open components even when
+ we don't find them in their parent's directory to
+ support automounters.
+
Tue Sep 15 11:06:13 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_move_resize): Don't request
+Tue Sep 15 13:09:24 1998 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/gdkimage.c (gdk_image_new): Reverted global changes
+ of g_new to malloc(), added back in the one place where
+ it actually mattered. #include <stdlib.h>.
+
+ * gdk/gdkrgb.c: g_malloc() to malloc() as above.
+
+Tue Sep 15 11:30:03 1998 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkfilesel.c: Keep a list of directories in which we never
+ want to stat the entries (like /afs), and assume everything in
+ those directories is a subdirectory.
+
+ - When following a path, try to open components even when
+ we don't find them in their parent's directory to
+ support automounters.
+
Tue Sep 15 11:06:13 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_move_resize): Don't request
+Tue Sep 15 13:09:24 1998 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/gdkimage.c (gdk_image_new): Reverted global changes
+ of g_new to malloc(), added back in the one place where
+ it actually mattered. #include <stdlib.h>.
+
+ * gdk/gdkrgb.c: g_malloc() to malloc() as above.
+
+Tue Sep 15 11:30:03 1998 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkfilesel.c: Keep a list of directories in which we never
+ want to stat the entries (like /afs), and assume everything in
+ those directories is a subdirectory.
+
+ - When following a path, try to open components even when
+ we don't find them in their parent's directory to
+ support automounters.
+
Tue Sep 15 11:06:13 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_move_resize): Don't request
*/
#include "../config.h"
+#include <stdlib.h>
#include <sys/types.h>
#if defined (HAVE_IPC_H) && defined (HAVE_SHM_H) && defined (HAVE_XSHM_H)
Visual *xvisual;
GdkImage *image;
GdkImagePrivate *private;
- private = malloc (sizeof (GdkImagePrivate));
+ private = g_new(GdkImagePrivate, 1);
image = (GdkImage *) private;
private->xdisplay = gdk_display;
private->image_put = gdk_image_put_normal;
break;
default:
- private = malloc (sizeof (GdkImagePrivate));
+ private = g_new (GdkImagePrivate, 1);
image = (GdkImage*) private;
private->xdisplay = gdk_display;
{
private->image_put = gdk_image_put_shared;
- private->x_shm_info = malloc (sizeof (XShmSegmentInfo));
+ private->x_shm_info = g_new (XShmSegmentInfo, 1);
x_shm_info = private->x_shm_info;
private->ximage = XShmCreateImage (private->xdisplay, xvisual, visual->depth,
{
g_warning ("XShmCreateImage failed");
- free (image);
+ g_free (image);
gdk_use_xshm = False;
return NULL;
}
g_warning ("shmget failed!");
XDestroyImage (private->ximage);
- free (private->x_shm_info);
- free (image);
+ g_free (private->x_shm_info);
+ g_free (image);
gdk_use_xshm = False;
return NULL;
XDestroyImage (private->ximage);
shmctl (x_shm_info->shmid, IPC_RMID, 0);
- free (private->x_shm_info);
- free (image);
+ g_free (private->x_shm_info);
+ g_free (image);
return NULL;
}
shmdt (x_shm_info->shmaddr);
shmctl (x_shm_info->shmid, IPC_RMID, 0);
- free (private->x_shm_info);
- free (image);
+ g_free (private->x_shm_info);
+ g_free (image);
gdk_use_xshm = False;
return NULL;
}
else
{
- free (image);
+ g_free (image);
return NULL;
}
break;
#else /* USE_SHM */
- free (image);
+ g_free (image);
return NULL;
#endif /* USE_SHM */
case GDK_IMAGE_NORMAL:
private->ximage = XCreateImage (private->xdisplay, xvisual, visual->depth,
ZPixmap, 0, 0, width, height, 32, 0);
- private->ximage->data = malloc (sizeof (char) * private->ximage->bytes_per_line * private->ximage->height);
+ /* Use malloc, not g_malloc here, because X will call free()
+ * on this data
+ */
+ private->ximage->data = malloc (private->ximage->bytes_per_line *
+ private->ximage->height);
break;
case GDK_IMAGE_FASTEST:
if (win_private->destroyed)
return NULL;
- private = malloc (sizeof (GdkImagePrivate));
+ private = g_new (GdkImagePrivate, 1);
image = (GdkImage*) private;
private->xdisplay = gdk_display;
shmdt (x_shm_info->shmaddr);
shmctl (x_shm_info->shmid, IPC_RMID, 0);
- free (private->x_shm_info);
+ g_free (private->x_shm_info);
image_list = g_list_remove (image_list, image);
#else /* USE_SHM */
g_assert_not_reached ();
}
- free (image);
+ g_free (image);
}
static void
GdkWindow * confine_to,
guint32 time)
{
- GdkInputWindow *input_window, *new_window;
GList *tmp_list;
+ GdkInputWindow *input_window;
GdkDevicePrivate *gdkdev;
- GList *tmp_list;
tmp_list = gdk_input_windows;
while (tmp_list)
input_window = (GdkInputWindow *)tmp_list->data;
if (input_window->window == window)
- new_window = input_window;
- else (input_window->grabbed)
+ input_window->grabbed = TRUE;
+ else if (input_window->grabbed)
input_window->grabbed = FALSE;
- tmp_list = gdk_input_devices;
- while (tmp_list)
- {
- gdkdev = (GdkDevicePrivate *)tmp_list->data;
- if (gdkdev->info.deviceid != GDK_CORE_POINTER &&
- gdkdev->xdevice &&
- (gdkdev->button_state != 0))
- gdkdev->button_state = 0;
-
- tmp_list = tmp_list->next;
- }
-
+ tmp_list = tmp_list->next;
+ }
+
+ tmp_list = gdk_input_devices;
+ while (tmp_list)
+ {
+ gdkdev = (GdkDevicePrivate *)tmp_list->data;
+ if (gdkdev->info.deviceid != GDK_CORE_POINTER &&
+ gdkdev->xdevice &&
+ (gdkdev->button_state != 0))
+ gdkdev->button_state = 0;
tmp_list = tmp_list->next;
}
- new_window->grabbed = TRUE;
return Success;
}
#include <math.h>
#include <stdio.h>
+#include <stdlib.h>
#define ENABLE_GRAYSCALE
for (i = 0; i < N_IMAGES; i++)
if (image_info->bitmap)
+ /* Use malloc() instead of g_malloc since X will free() this mem */
static_image[i] = gdk_image_new_bitmap (image_info->visual,
- g_malloc (IMAGE_WIDTH * IMAGE_HEIGHT >> 3),
+ malloc (IMAGE_WIDTH * IMAGE_HEIGHT >> 3),
IMAGE_WIDTH, IMAGE_HEIGHT);
else
static_image[i] = gdk_image_new (GDK_IMAGE_FASTEST,
*/
#include "../config.h"
+#include <stdlib.h>
#include <sys/types.h>
#if defined (HAVE_IPC_H) && defined (HAVE_SHM_H) && defined (HAVE_XSHM_H)
Visual *xvisual;
GdkImage *image;
GdkImagePrivate *private;
- private = malloc (sizeof (GdkImagePrivate));
+ private = g_new(GdkImagePrivate, 1);
image = (GdkImage *) private;
private->xdisplay = gdk_display;
private->image_put = gdk_image_put_normal;
break;
default:
- private = malloc (sizeof (GdkImagePrivate));
+ private = g_new (GdkImagePrivate, 1);
image = (GdkImage*) private;
private->xdisplay = gdk_display;
{
private->image_put = gdk_image_put_shared;
- private->x_shm_info = malloc (sizeof (XShmSegmentInfo));
+ private->x_shm_info = g_new (XShmSegmentInfo, 1);
x_shm_info = private->x_shm_info;
private->ximage = XShmCreateImage (private->xdisplay, xvisual, visual->depth,
{
g_warning ("XShmCreateImage failed");
- free (image);
+ g_free (image);
gdk_use_xshm = False;
return NULL;
}
g_warning ("shmget failed!");
XDestroyImage (private->ximage);
- free (private->x_shm_info);
- free (image);
+ g_free (private->x_shm_info);
+ g_free (image);
gdk_use_xshm = False;
return NULL;
XDestroyImage (private->ximage);
shmctl (x_shm_info->shmid, IPC_RMID, 0);
- free (private->x_shm_info);
- free (image);
+ g_free (private->x_shm_info);
+ g_free (image);
return NULL;
}
shmdt (x_shm_info->shmaddr);
shmctl (x_shm_info->shmid, IPC_RMID, 0);
- free (private->x_shm_info);
- free (image);
+ g_free (private->x_shm_info);
+ g_free (image);
gdk_use_xshm = False;
return NULL;
}
else
{
- free (image);
+ g_free (image);
return NULL;
}
break;
#else /* USE_SHM */
- free (image);
+ g_free (image);
return NULL;
#endif /* USE_SHM */
case GDK_IMAGE_NORMAL:
private->ximage = XCreateImage (private->xdisplay, xvisual, visual->depth,
ZPixmap, 0, 0, width, height, 32, 0);
- private->ximage->data = malloc (sizeof (char) * private->ximage->bytes_per_line * private->ximage->height);
+ /* Use malloc, not g_malloc here, because X will call free()
+ * on this data
+ */
+ private->ximage->data = malloc (private->ximage->bytes_per_line *
+ private->ximage->height);
break;
case GDK_IMAGE_FASTEST:
if (win_private->destroyed)
return NULL;
- private = malloc (sizeof (GdkImagePrivate));
+ private = g_new (GdkImagePrivate, 1);
image = (GdkImage*) private;
private->xdisplay = gdk_display;
shmdt (x_shm_info->shmaddr);
shmctl (x_shm_info->shmid, IPC_RMID, 0);
- free (private->x_shm_info);
+ g_free (private->x_shm_info);
image_list = g_list_remove (image_list, image);
#else /* USE_SHM */
g_assert_not_reached ();
}
- free (image);
+ g_free (image);
}
static void
GdkWindow * confine_to,
guint32 time)
{
- GdkInputWindow *input_window, *new_window;
GList *tmp_list;
+ GdkInputWindow *input_window;
GdkDevicePrivate *gdkdev;
- GList *tmp_list;
tmp_list = gdk_input_windows;
while (tmp_list)
input_window = (GdkInputWindow *)tmp_list->data;
if (input_window->window == window)
- new_window = input_window;
- else (input_window->grabbed)
+ input_window->grabbed = TRUE;
+ else if (input_window->grabbed)
input_window->grabbed = FALSE;
- tmp_list = gdk_input_devices;
- while (tmp_list)
- {
- gdkdev = (GdkDevicePrivate *)tmp_list->data;
- if (gdkdev->info.deviceid != GDK_CORE_POINTER &&
- gdkdev->xdevice &&
- (gdkdev->button_state != 0))
- gdkdev->button_state = 0;
-
- tmp_list = tmp_list->next;
- }
-
+ tmp_list = tmp_list->next;
+ }
+
+ tmp_list = gdk_input_devices;
+ while (tmp_list)
+ {
+ gdkdev = (GdkDevicePrivate *)tmp_list->data;
+ if (gdkdev->info.deviceid != GDK_CORE_POINTER &&
+ gdkdev->xdevice &&
+ (gdkdev->button_state != 0))
+ gdkdev->button_state = 0;
tmp_list = tmp_list->next;
}
- new_window->grabbed = TRUE;
return Success;
}
projects / gtk4.git / commitdiff